Fix #3989: Fix several unsoundness problems related to variant refinement #4013
+335
−73
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.